From 84a62ec3f071782df0150d0a1ec8a165d031196d Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Mon, 1 Jun 2020 12:55:10 -0600
Subject: [PATCH] clean up mkstyle.sh (#578)

as suggested by shellcheck used $() instead of backticks,
and double quote to prevent globbing and word splitting.
mkstyle.sh now works if the directory path contains a space.

drop the failed attempt to exclude custom.style. This resolves #577
drop the exclusion of README.style, which hasn't existed for a long time.

use basename to drop the suffix instead of piping to sed.
---
 mkstyle.sh | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/mkstyle.sh b/mkstyle.sh
index 5ff0b5001..1471a7705 100755
--- a/mkstyle.sh
+++ b/mkstyle.sh
@@ -12,34 +12,32 @@ export LC_COLLATE
 # require gnu sed even though we aren't using gnu extensions.
 # this avoids portability issues with other seds.
 if gsed v /dev/null 1>/dev/null 2>&1; then
-    SED=gsed
+  SED=gsed
 elif sed v /dev/null 1>/dev/null 2>&1; then
-	# sed is gnu sed
-    SED=sed
-elif [ `uname -s` = "FreeBSD" ]; then
-       # BSD sed is fine
-    SED=/usr/bin/sed
+  # sed is gnu sed
+  SED=sed
+elif [ "$(uname -s)" = "FreeBSD" ]; then
+  # BSD sed is fine
+  SED=/usr/bin/sed
 else
-	echo "Error: can't find gnu sed" 1>&2
-	exit 1
+  echo "Error: can't find gnu sed" 1>&2
+  exit 1
 fi
 
 echo "#include <QtCore/QVector>"
 echo "#include \"defs.h\""
 echo "#if CSVFMTS_ENABLED"
-for i in `dirname $0`/style/*.style
+for i in "$(dirname "$0")"/style/*.style
 do
-	A=`basename $i | sed "s/.style$//"`
-	[ $A = "README" ] && continue
-	[ $A = "custom.style" ] && continue
+  A=$(basename "$i" .style)
   if [ "x${ALIST}" = "x" ]; then
-	  ALIST="{ \"$A\", $A }"
+    ALIST="{ \"$A\", $A }"
   else
-	  ALIST="{ \"$A\", $A }, $ALIST"
+    ALIST="{ \"$A\", $A }, $ALIST"
   fi
-	echo "static char $A[] ="
-	$SED 's/\\/\\\\/;s/"/\\"/g;s/^\(.\)/"\1/g;s/\(.\)$/\1\\n"/g;s/^\(.\)/  \1/' $i
-	echo "  ;"
+  echo "static char $A[] ="
+  $SED 's/\\/\\\\/;s/"/\\"/g;s/^\(.\)/"\1/g;s/\(.\)$/\1\\n"/g;s/^\(.\)/  \1/' "$i"
+  echo "  ;"
 done
 echo "const QVector<style_vecs_t> style_list = {$ALIST};"
 echo "#else /* CSVFMTS_ENABLED */"
-- 
2.30.2